868a811779476ffb8810d06002d40c0b12c07f36,msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/DiscussionForumServiceImpl.java,DiscussionForumServiceImpl,merge,#String#Element#String#String#Map#Map#Set#,497

Before Change


														Area area = areaManager.getDiscusionArea();
														dfForum.setArea(area);
														dfForum.setDraft(new Boolean("false"));
														forumManager.saveDiscussionForum(dfForum, false);
													}
													hasTopic = true;

													forumManager.saveDiscussionForumTopic(dfTopic);
												}                  			
											}
										}

										if(!hasTopic)
										{
											Area area = areaManager.getDiscusionArea();
											dfForum.setArea(area);
											dfForum.setDraft(new Boolean("false"));
											forumManager.saveDiscussionForum(dfForum, false);
										}
									}

After Change


														dfForum.setArea(area);
														if ("false".equalsIgnoreCase(ServerConfigurationService.getString("import.importAsDraft")))
														{
															forumManager.saveDiscussionForum(dfForum, dfForum.getDraft().booleanValue());
														}
														else
														{
															dfForum.setDraft(new Boolean("true"));
															forumManager.saveDiscussionForum(dfForum, true);
														}
													}
													hasTopic = true;

													forumManager.saveDiscussionForumTopic(dfTopic, dfForum.getDraft().booleanValue());
												}                  			
											}
										}

										if(!hasTopic)
										{
											Area area = areaManager.getDiscusionArea();
											dfForum.setArea(area);
											if ("false".equalsIgnoreCase(ServerConfigurationService.getString("import.importAsDraft")))
											{
												forumManager.saveDiscussionForum(dfForum, dfForum.getDraft().booleanValue());
											}
											else
											{
												dfForum.setDraft(new Boolean("true"));
												forumManager.saveDiscussionForum(dfForum, true);
											}
										}
									}